#100: Fixed some things

Fixes for some forgetten changes in my last commit