Storable, fixes