followup 6b0dbe3:
minor fixes