Fixes before update to store