Fix compile errors from last commit.