Fixups after further uppmax testing, now ready for staff