Improvements to various storage functions.