Tweaks for GXD switch to EMAPA.