Fixing intel builds