Fixes to rules

@schmmd