Fixes to Celery tasks and models