Changes for affiliate and ubercart