Hotfix v1.1.1 Fixes