Small fixes

This time I wont add any refactoring. Swear! :sailboat: