Fix android issues