Examples cleanup/fixes