more pisseria optimizations