Fix issues with LZ