repair some barrier rules