Fix some behaviors