Code Review Tweaks and Bug Fixes

https://github.com/GigaOM/gigaom/issues/4633

Fixes:
https://github.com/GigaOM/gigaom/issues/4912
https://github.com/GigaOM/gigaom/issues/4913

Code Review:
https://github.com/GigaOM/gigaom-plugins/pull/2297/files#diff-2ca3a3b88344a8506efdbf5fd24666d7R308