A few minor compressor cleanups