--fixes for comments on PR #560 and #561