Polish changes from #1586
3 files changed