more rule fixes