More streams conversion to get us through installer.