More wp tweaks