Latest issues fixed