Make some minor adjustments to rules