Fix a few build issues after merge
better way of handling FileNotFoundException on android