Fix some MutinyII stuff