Some fixes for GooglePlayFallback