WP-4634 Some changes after intial testing