Fixed some errors from code review.