Some other bug fixes 🐞