Fix compilation errors (URGENT)

For some reason, the latest 7_2_X IB has three packages that do not compile.
The fixes are trivial, and are the content of this pull request.Unless I am missing something, It would be nice if this pull request, or equivalent other pull requests, could be merged before the next IB.
This is probably not the time to wait for signatures or other approvals.