24.4 fixes