Fix compiler errors due to data api changes