Revert some stuff and fix overdoses