Improvements based on feedback, see #3203