Doing things to make the demo work