Small Bugfix and Improvements