Panorama fixes