Fixes for WP 4.0