Resolve performance problems