Properly fix warning, fix compilation error of previous commit.