Minor fixes

Signed-off-by: Chandra Maharzan <maharzan@gmail.com>