Improvments to performance.