Fixes at Comcast test