Fixing QE PBs (#1056)