some warning cleanups