Fix compilation issues...