Merge change 22152 into eclair

* changes:
  Fix a couple of compiler warnings.