PLCBC-4: Fix compilation issues under 5.8