Fix a couple of things for multicorn