More issues fixed.