Image location fixes