error fixes and related