[FOLD] Store fixes