2nd set of error fixes