More li3 standard changes and fix popporn matches