2.0.2 fixes