Fix minor performance issues.