Fixes 20130413 

Tonight's bunch.

96640e5f6f03938a704d64d91aef68522b505511 seems to have broken the examples for me.