Sticky fixes

Fixes DoSomething/dosomething#1116.
Fixes DoSomething/dosomething#1117.