Tying up a few loose ends in compressor