fix workshare bugs