Od/location fixes2