20140604 fixes for CWR comments