devices: more alignment fixes