Fixes for inventory loss