Clean up some errors and warnings.