Updated fixes to comply with android build