Hotfix v1.0.2 Fixes