Compression fixes