Fix location inconsistencies