Fixed some performance issues