multiple error fixes