1.0.9 fixes