various CCR related bugs fixed