Fixed small items of CWM