Possible error fixes