[FOLD] Store and fixes