Bugfixing some more