Fix location method, tag others that are broken