Fixed stuff for the demo