android compilation fixes