Address some warnings.