Minor fixes from comments