Some fixups from testing in DAL2