Minor fixes.
Sample results for lazy folk
Merge branch 'jpountz-minor_fixes'