More bugfixes for the night