Fix issues from PR