Storage path bug fixes