Address issues #2 and #4

Signed-off-by: nigel <nigel.cook@hp.com>