Fixes for adding callback interface (Android)