A few changes needed for WP