More panorama fixes