Android

Minor changes to compile for android