[WP] Fix of all detected bugs