OverHaul Fixes