Fix storage path hard-codes. Closes #1155.