Updates to pass tests on upcoming relengapi 0.3 (master)