Fixing some enqueuing issues.