Re-added mutiny fixes