More minor Bugfixes