Some fixes that need to be in PhotoSwipe master