Fixes for Workbench Moderation Integration