Demo hotfixes 2