minor ems fixes