Fixes for feedback in #341.