Began fixing mayor ambiguity problems in the system