Fix issues with TARGET_CPU_VARIANT