Weirdness in path trees. Commit-as-stash.
Fixes to get bootstrap working with storageview