Fix some compile errors that resulted from "refactor" merge.