Port some changes needed in pro