Added user file system bypass to prevent crash. Fixed minor issues