Clean up of errors and warnings.