NSM GoogleDrive: fixes for pr #182
NSM: fixes for pr #182