Some fixes in photo-event system