Fixed remaining workbench compile errors.