WP-3989 Some minor form adjustments