c21, c23, c24 fixes