fixing some nfstaash integration bugs