Various updates after workstation upgrade.
Fix merge.