Small fixes to meet review.