Fix some backwards compatibility issues