Tweaks related to revamped Geko_Wp_Initialize