Bugfixes Part 2