OverHaul fixes