Resolve performance issues