12.3 fixes