Fix backwards compatibility breaks