Small fixes
Fix fourier_motzkin type; s = 1
Merge branch 'fix_s'