few small followon fixes