Fix CPU_VARIANT and add flags