Cumulative update from HLTE.
Fix compilation