Bugfixes Round 2

+ Misc fixes