more hot fixes
Store part fixed