HO build changes