Fixes from comments.