Fixes for latest Android changes