Initial changes for compatibility with non-MTK devices