Fix #753: Various cleanups based on gcc warnings