Hotfix errors