Address some performance concerns