Massive Lint improvements (not shown in log yet)