Update collect: true to methods and servers and fix regressions