RC1 fixes 4
+ Helper store