More ql fixes