Comple out WITNESS and INVARIANTS. Fixed compilation warnings.