This patch fixes some issues with the zuulv3 changes. Change-Id: I27dfdbe9cb29f12c9ab245258f1afefbb1da6090