Small language fixes and two eps conversions