Fix usage of gccalcstorage