Closed #104: Review fixes