Fixes for stupid customers
Merge branch 'rr-giveaways-header' into staging