Further sync fixes for hotspots and images