Less warnings and more examples