Fix some bugs in the workplace setup