Some GCC and injector fixes