Warning cleanups