[WP] Some fixing