Correct compiler errors from last commit.