Bugfixes: round 4 of non-patrick edge cases