Remove warnings, fix android project