Fixes for photos, albums