Hotfix changes for default values in 0.6.5