fix some celery support related bugs