Minor follow-up fixes for #293
Merge pull request #360 from tuncer/pr293-follow-up

Minor follow-up fixes for #293