fixes for compatibility with the latest android fixes.