Further tweaks

Signed-off-by: Richard <rich.g.cook@gmail.com>