Minor tweaks to sm and sec storage outside