Fixes from review comments.