1.0 issues fixed