Fixed a few liquid storage problems