Fixed some console errors post move to the new UI