Corrections necessary to recover a little functionality in some demo pages