Simple CHRouter stability fixes.