Bugfixes while tired