Adjustments to fix WP-951.