Better slug handling