Improve LZ stuff