FIX #8 issue on android
More file system updates