Potential fixes for harness for 2.2