Updates for FAW setups

Updates for First Affiliate Wins setups.