various fixes requested from QA pass
Merge pull request #103 from gvn/1093796

1093796