More improvements from Stefan