[PATCH 1/6] Fix a few minor problems introduced by recent raid level changes.