Fix backwards compatibility issues