Security + performance improvements.