Fix examples

See commit msg for more info