Bugfixes again