Make GM buff (Rock buff, leafre buff etc etc) stack with other buffing skills but reduce the ATT stat to 10 ATT (down from 20 ATT). By doing this, Rage, Dragon Blood, Bless and Energy Charge would now be useful again and not feel "wasted". For example as a marauder it doesn't feel that great to go to leafre and have Energy Charge (+20 ATT) complitely neglected by rock buff while other classes that dont have self ATT buff gain 20 ATT for free. This will also bring back the reason to have Crusaders in your party for Rage.