Some smaller Bugfixes