2.0.0 fixes