HQ methods fixes