v1.0 fixes