Fix pull request small bugs