Modifications to slug handling