A few CPS bugs fixed.