More Demo mode tweaks