Fix and clean storage settings