Hotfixed 2 things