Porting fixes.

7 files changed