dm: adjust structure members to improve alignment