Fix workbench compile issues