Small fixes

Signed-by: Brian Andrews <b@nzamps.com>