Cleanup

Various minor fixes
Mount util

Roughing out mount default utility