Fixes on quests