Fix the last known issue with handling of Storable metadata, new tighter sanity checks