WP 3.9 Fixes