Hotfix/reg errors