Fix issues from review (#2)