Fixed issues relating to default storage.