Some more changes for backward compatibility