Hotfix fixes