Cleanup some warnings.