Changes to meet WP requirements.