more fixes for WP