Fixed location bugs