Celery tweaks

plus some import race condition fixes