Fix some issues with android version