Enabling rule component
A few fixes