Fixed storage issues.