Assorted changes to permissions and assertions.