Updated behaviors to address bugs found in code review. No change to functionality as described in changelog.