Tweak some stuff for demo