Minor Tweaks to Raid System