Fix various workbench issue