more cr16 fixes