Fix to compile HEAD with 0.9.3.3
Improved examples/standalone