Fixed more glitches in GAPI