#478: Small edits