Code cleaning: remove some warnings.