[WP] Some more style fixes