More fixes for celery