Some more Bugfixes