Fixes and autoapplying of rules;