Final fixes
Merge branch 'tb-giveawayfix' into staging