Minor changes + early android support