Sync up with new converter changes