Porting fixes.

16 files changed