5.4 fixes