Minor changes

Now it should work on Android