Fixed some ESL weirdnesses