a bunch of compatibility fixes because of ARQGRA-170