Fixing Android 'dorkq' issues