[FOLD] More fixes