Some fixes based on some of the reviews.