Fixing things to work with CW