Fix and extend examples