4 issues fixed