Fixing some bugs in the example