Fix some Android warning and minor issue