Remove the GCC Wrapper, build fixes