Porting fixes.

2 files changed