More performance improvements.