eg: minor fixes