More minor ESL changes