Changes because of libsparrow changes