Updated compressor handling