Fixes based on review feedback.