workstation fixes