Some fixes for non-Gemini MTK devices