FL-392: update eix, little corrections from upstream