Some fixes for the photo migration