Merge pull request #11 from pgm/vanilla-minor-fixes

Vanilla minor fixes
Merge branch 'vanilla_improvements' into vanilla-minor-fixes