Some android compilation fixes