Fix backward compatibility issues