Merge changes I1dfe21e5,Ia0218bf8

* changes:
  Clean up warnings.
  Minor refactorings.