Minor win_user fixes based on feedback.