Fixed current *.Behaviour deprecations.