More stupid bugfixes