Fix Universal Cable TE support, fix build.xml