Fix incompatible changes