(GX) Build fixes/cleanups