Behavior bug fixes