changes for android porting