Add another round of compressor fixes