Cloud files gs fix

Merging Ken's changes.