2 issues fixed