More minor changes

Signed-off-by: Jon Ludlam <jludlam@localhost.localdomain>