Smaller Bugfixes