touchups after alspec-9.1 merge into develop