Porting fixes.

27 files changed