Some compilation errors with previous commit.