[mr2873] Fixes to G3D