Minor but important fixes for demos (Touch only)