Bugfixes some more