Default scoped affiliation

... and two unrelated bugfixes.