Fix Data object support.