Clean up of some warnings.