Raid fixes