Task issues fixed