Small changes following up gh-392 (GSN)