Bugfixes found during manual testing