fixes (see changelog)