fixing android issues