WP-Syntax patches