Fix some warnings
Save storage option