More work on android support