Fixes based on comments.