Fix compile errors following core changes