CUT and GREP Bugs Fixed