Fix some Mutiny stuff