Job location fixes