Minor fixes to workstation