Back porting fixes.