Changes to make QC work on farm3