shish/shimmie2 — pull request #386 by shish (2014-03-17 22:08:19+00:00)
Title: A few fixes for things scrutinizer-ci found

Nowhere near all cleaned up, but it's bedtime now :P

(I'm assuming that it's worth merging these fixes in small chunks rather than all in one go, as the one patch to fix all of them would be unmanagably huge)