Vineet fixes

Hi Jeremy,

Couple of fixes for you to merge.

Thx,
-Vineet