fixups for aldebaran
merge