Fixed issues with android