cr16 fixes