Playground fixes
Merge pull request #458 from priand/playground

Playground fixes