Fix minor issues and update some example code

Feel free to cherrypick some commits and drop others as you see fit.

Merge request reports

Loading