Fix some more LZ bugs