Review #1 fixes

Signed-off-by: Chandra Maharzan <chandra@graphpaperpress.com>