More initial error fixes