Fix compile errors from other changes