Improve draft behaviour to reduce conflicts.