Merge tiash fixes & improvements