hotfixes for the demo