Small changes (#1232)

* Based on suggestions from #1218
4 files changed