Fixes for affiliate links