Fix backwards incompatible changes