Small Bugfixes and Improvements