Fix errors and reduce warnings on clang (merge from mdeters/clang)
fix --check-model --finite-model-find when used together (related to bug 486)