minor corrections
works with changes from #920