Errors fixes