Fix issues from reviewer feedback