Minor fixes observeed during testing.

Change-Id: I2019e5e1e496b2caac0a435a0ae9ee4cac7b49b3
Signed-off-by: Amit Mandke <ammandke@cisco.com>