Overhaul fixes