Fix compilation breaks