More UniversalStorage tweaks.