An update in order to fix a few small bugs reported by the community 🐛