Pre-release fixes.
Re-do the example 01.