few minor fixes in couple places