Fixes for mutiny mode