Behavior fixes

I had to make the following changes in the Behavior in order to make the Plugin work for me.