Fixed compilation issues with Android