Converted more files to use Open2