Few fixes to the fabric file.