some fixes for the demo at EclipseCon NA 2013