Fixing a bunch of QR stuff