More fixes to enable non-TFS deploy