Lots of examples fixes due to recent API changes