Continue to tweak things for workbench changes.