fixes for Photos and such