more fixes 🎃