More performance issues fixed.