More 5.3 fixes