(GX) Build fixes