Improvements of some demo files