More GCC Fixes