Update fabric and make clear issues