Merge changes I937ac6ab,Ib94f78f7

* changes:
  Fix compiler warnings.
  Fix warnings in bitrotted module