Performance minor updates