Some minor fix in location set