Behavior issues fixed