A few more warnings cleanups