Minor fixes WP5