Fixed bugs that caused the file system to not get mounted
Merge branch 'master' into mountfix
Fixed several functions that were not working correctly