Lightbox fixes