Fix a couple of manio problems in phase3.