More fixes based on review comments.