3.0 fixes