V1.0 fixes