Celery fixes