Android compatibility and some interface changes