Addressing some performance issues