CGE2: Fix some more GCC warnings