Fixes for WP