fixes for CMWR