Minor fixes from Steven.