First phase issues fixed