fix issues from PR