Fixing some issues wrench bump created