Fix location equality issues