3 fixes from github

3 fixes from github