Fixes for affiliate menus