WP-1663 spacing fixes