Fixes from running on my android.