Fixes for generic build.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Fixes for generic build.