Some small fixes for "Working with Bolt"