Bugfixes (I'm stupid)