Misc Bugfixes