More Analysis porting fixes