Fix compile problems from core changes