Some work in android export