Hotfixed and demo adjustments