Silence some gcc warnings and other minor cleanups