Some tweaks

Signed-off-by: Tim Smart <tim@fostle.com>