More commit issues fixed