DAET: fix alignment & misc