add necessary changes for new FNAL fs restrics