Misc updates

Some miscellaneous updates, fixing snapshot views and dialing back assertions in the directory manager code.