Fix bugs from review.