Hey all!
Got a few small patches for issues introduced in a3b50500. I've ensured the autotests in question are gucci now. All other test results are the same as master.
There's also a small fix @apol suggested in there too
