opt fixes for gstorage