Fixes more overhaul errors