Backward compatibility fixes.