Initial tweaks to add back to WP