Shadowdare fixes