Storage module fixes