Solving commit problems