Incorporating fixes from Helen