Fixes to new store loading if not migrated.