cleanups based on gcc warnings