Some changes for ivy to work