Make things more usable

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>