performace fixes