A few fixes to merge latest yteitel commit.