Added tweaks for new university machines.