Some fixes for WP