Final changes from debugging demos.