Couple changes and fixes

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>