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, PLEASE merge this pull request, or equivalent other pull requests, before the next IB.
This is not the time to wait for signatures or other approvals.