Fixing some issues with the example