Several updates to match current version of Tachyon

Apply TachyonURI and update matched exceptions