Fixed some Workbench compile errors from GP