Fix string keys for gapi calls everywhere...