Fix/photo issues