Last TFS and fixes