Fix compiler failures due to interface changes