Some fabric file fixes