minor Bugfixes