A couple of bug fixes due to QA Jim :)