Made some further fixes to RasterStore.