<Android> Fix some bugs