synched bug fixes with CHRR