More issues fixed