GPII-752: Few tweaks, still broke