More warnings cleanups