Bug fixes to Behavior