5.0 fixes