Maint 11 (miscelleaneous changes)

Fixes ever more problems, i'd forgotten that Virologist's don't have
normal maint access.