Assassin/Brotherhood/Nightmare fixes