fixes for ivy