minor changes collected when merging to upstream