[Emulink] Minor improvements