v1.0.2 fixes