Some more issues fixed.