Fix some weld related TCK issues