Clean up the rest of the warnings.