fixes, see changelog