Fix errors on first two maps