Jhbate/cleanup

a couple of small cleanup items raised as part of testing