Minor Bugfixes