Fix bugs on fabric files