Bug fixes for PhotoShare app