Windows and custom storage location fix