Fixing stuff to work for the demo