More silly bugfixes