Fix issues from review. #4453