more fixes from github issue list