Fix compilation isues