Fix wrench crashes