some fixes for new api