Few changes related to how FMS deal with system command

I can't push on the repo.