Improve validation and bump WP version