HB L0 run-dependent temporary fix and HO bugfix