Feature #5592: Fix compilation issues