Fixing Android stuff