Some tweeks and move to FQC helper.