Fixes after review.