More WP fixes