More bugfixes: Part 2.