More 23 fixes