adjust to some api changes