More fixes from suggestions.