Re-fix of a Mono problem + modify some 'var' usage