Changes due to photo/frontend bugfixes

Oops, this PR should have been to upstream