Fixed broken calls to several function due to core changes