Tweaks to make this stuff actually work.

https://github.com/GigaOM/gigaom/issues/4162