workstation and  pir fixes