Adjustments towards recommeded standards by WP