Fixing stupid bugs breaking the demo for everyone :(