Android improvements