some changes for android compatibility