Hotfix and Improvements