Fix gsystem build