bugfixes to GAPI-based drive upload