3rd set of error fixes