Fix some minor issues from the review