Cleanup of some warnings.