Continue to clean up warnings.