Fix new calls for location and poll storage