Em tiny improves which added after

@jurgens, @bartzitz