A few of my printks slipped through last time. Also fix a couple of
minor bugs.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>