Fixing warnings (Laurent)