WP small fixes