fix some pullrequest issues