Last bugfixes needed to give a demo