More bugfixes: Part 1.