Final changes for Fluidigm support