Added fixes to remove innocuous error codes