Fix all problems with workbench