Maintenance Bugfixes (please add the last commit only)

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