Fixes for WordPress 3.9