Additional fixes from QE feedback