enable some already fixed demos
Merge fixes from Jan Blechta.
Merge fixes from Jan Blechta