Further fixes (stupid kdiff automerge)