Updates to comply with the ag-master changes