More StorageLocation cleanup and other misc changes