More CUP fixes.