Improved performance of some behaviors