Minor Examples improvements