Hotfixes for 1/13 Demo