Updates and fixes for examples