Fix issues from code review feedback