Improvements for the WordPress 3.9 support